update macos, linux builds to use Qt 5.12.9 (#596)

* switch macos to Qt 5.12.9

* rebuild docker images

diff --git a/.travis.yml b/.travis.yml
index 9ef722c303bd384dc39975c5a490545a5b325e39..c2369fd993cd2355abcdd6afbb5ac2320866b243 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,7 +64,7 @@ jobs:
     - os: osx
       osx_image: xcode10.3
       compiler: clang
-      env: QT_VERSION="5.12.8"
+      env: QT_VERSION="5.12.9"
       cache:
         directories:
           - $HOME/Cache
@@ -95,7 +95,7 @@ script:
 after_success:
   - cd ${TRAVIS_BUILD_DIR}
   # only deploy pushes to master or prs that target master.  the prs will go to transfr.sh, the pushes go to github.
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ] &&  [ "${QT_VERSION}" = "5.12.8" ] && [ "$TRAVIS_BRANCH" = "master" ]; then bash ./tools/uploadtool/upload.sh  gui/GPSBabel-*.dmg; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ] &&  [ "${QT_VERSION}" = "5.12.9" ] && [ "$TRAVIS_BRANCH" = "master" ]; then bash ./tools/uploadtool/upload.sh  gui/GPSBabel-*.dmg; fi
 
 branches:
   except:

diff --git a/tools/make_docker_qtio_image b/tools/make_docker_qtio_image
index d57f26f37ff2f03ab074c9ca83bfd5ef37adcccb..29b1b588ef669aef31e14c1ab8245b7d82648e8b 100755 (executable)
--- a/tools/make_docker_qtio_image
+++ b/tools/make_docker_qtio_image
@@ -5,7 +5,7 @@
 versuffix=_qtio
 tag=$(date -u +%Y%m%dT%H%M%SZ)
 
-QT_VERSION=5.12.8
+QT_VERSION=5.12.9
 QT_VERSION_SHORT=${QT_VERSION//./}
 QT_CI_PACKAGES="qt.qt5.${QT_VERSION_SHORT}.gcc_64,qt.qt5.${QT_VERSION_SHORT}.qtwebengine"
 DOWNLOAD_URL=$(./qtci/find_qt_installer ${QT_VERSION})